Revert 22706:ca10302ac285 "xenpaging: update machine_to_phys_mapping[] during page...

Crashes during boot, due to m2p tables not being set up early enough.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 7e3198c7f95b1d375910d60b5a1e8e3626f33117..a3f890f733d61f5c7ad3b2f3354166b04a07684d 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -527,7 +527,7 @@ static int reserve_offlined_page(struct page_info *head)
 static void free_heap_pages(
     struct page_info *pg, unsigned int order)
 {
-    unsigned long mask, mfn = page_to_mfn(pg);
+    unsigned long mask;
     unsigned int i, node = phys_to_nid(page_to_maddr(pg)), tainted = 0;
     unsigned int zone = page_to_zone(pg);
 
@@ -538,10 +538,6 @@ static void free_heap_pages(
 
     for ( i = 0; i < (1 << order); i++ )
     {
-        /* This page is not a guest frame any more. */
-        page_set_owner(&pg[i], NULL); /* set_gpfn_from_mfn snoops pg owner */
-        set_gpfn_from_mfn(mfn + i, INVALID_M2P_ENTRY);
-
         /*
          * Cannot assume that count_info == 0, as there are some corner cases
          * where it isn't the case and yet it isn't a bug: